Fix rendering of icons in some cases

svn path=/trunk/; revision=22308

diff --git a/ChangeLog b/ChangeLog
index 233b49d8875d380a92c1b0a05b9d8481e1caabfb..ca5d28c7ac6905ab22329d6af43419b1a6886ad8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 571249 – Icons are not drawn properly when initial widget 
+       state is insensitive
+
+       * gtk/gtkentry.c (gtk_entry_ensure_pixbuf): Render icons
+       in normal state, regardless of the entrys state. Reported by
+       Enrico Tröger.
+
 2009-02-11  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserbutton.c: Don't emit the file-set signal

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 36bcee6bf429ce494d76b54b7e48af5bcd1c6beb..04ae129fc72cadc47df1c45c53383ee594656717 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -6252,6 +6252,7 @@ gtk_entry_ensure_pixbuf (GtkEntry             *entry,
   GtkSettings *settings;
   gint width, height;
   GtkIconInfo *info;
+  gint state;
 
   if (!icon_info || icon_info->pixbuf)
     return;
@@ -6262,10 +6263,13 @@ gtk_entry_ensure_pixbuf (GtkEntry             *entry,
     case GTK_IMAGE_PIXBUF:
       break;
     case GTK_IMAGE_STOCK:
+      state = GTK_WIDGET_STATE (entry);
+      GTK_WIDGET_STATE (entry) = GTK_STATE_NORMAL;
       icon_info->pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
                                                   icon_info->stock_id,
                                                   GTK_ICON_SIZE_MENU,
                                                   NULL);
+      GTK_WIDGET_STATE (entry) = state;
       break;
 
     case GTK_IMAGE_ICON_NAME:
@@ -6285,10 +6289,15 @@ gtk_entry_ensure_pixbuf (GtkEntry             *entry,
                                                         0, NULL);
 
           if (icon_info->pixbuf == NULL)
-            icon_info->pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
-                                                        GTK_STOCK_MISSING_IMAGE,
-                                                        GTK_ICON_SIZE_MENU,
-                                                        NULL);
+            {
+              state = GTK_WIDGET_STATE (entry);
+              GTK_WIDGET_STATE (entry) = GTK_STATE_NORMAL;
+              icon_info->pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
+                                                          GTK_STOCK_MISSING_IMAGE,
+                                                          GTK_ICON_SIZE_MENU,
+                                                          NULL);
+              GTK_WIDGET_STATE (entry) = state;
+            }
         }
       break;
 
@@ -6314,10 +6323,15 @@ gtk_entry_ensure_pixbuf (GtkEntry             *entry,
             }
 
           if (icon_info->pixbuf == NULL)
-            icon_info->pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
-                                                        GTK_STOCK_MISSING_IMAGE,
-                                                        GTK_ICON_SIZE_MENU,
-                                                        NULL);
+            {
+              state = GTK_WIDGET_STATE (entry);
+              GTK_WIDGET_STATE (entry) = GTK_STATE_NORMAL;
+              icon_info->pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
+                                                          GTK_STOCK_MISSING_IMAGE,
+                                                          GTK_ICON_SIZE_MENU,
+                                                          NULL);
+              GTK_WIDGET_STATE (entry) = state;
+            }
         }
       break;